Ensure blk{tap/back}'s vm_area is not freed twice on error case.

Signed-off-by: Jake Wires <jwires@xensource.com>

diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
index 61433bba79e247337faa1b4e3ff7ec06e1bb67a2..6df7b734d694d591de1f212249df1faeab0c3a5f 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
@@ -136,6 +136,7 @@ int blkif_map(blkif_t *blkif, unsigned long shared_page, unsigned int evtchn)
        {
                unmap_frontend_page(blkif);
                free_vm_area(blkif->blk_ring_area);
+               blkif->blk_rings.common.sring = NULL;
                return err;
        }
        blkif->irq = err;

diff --git a/linux-2.6-xen-sparse/drivers/xen/blktap/interface.c b/linux-2.6-xen-sparse/drivers/xen/blktap/interface.c
index 21c4d551e7d5d84d1b4d8aa783861de545dfef86..11f800197a1e7da64b223929759c3e7bbabcb604 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/blktap/interface.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blktap/interface.c
@@ -137,6 +137,7 @@ int tap_blkif_map(blkif_t *blkif, unsigned long shared_page,
        if (err < 0) {
                unmap_frontend_page(blkif);
                free_vm_area(blkif->blk_ring_area);
+               blkif->blk_rings.common.sring = NULL;
                return err;
        }
        blkif->irq = err;